auto merge of #415 : alexcrichton/cargo/in-tree-docs, r=wycats
authorbors <bors@rust-lang.org>
Thu, 21 Aug 2014 17:20:50 +0000 (17:20 +0000)
committerbors <bors@rust-lang.org>
Thu, 21 Aug 2014 17:20:50 +0000 (17:20 +0000)
There's a bunch of travis config now to rebuild the website whenever something is merged into master.


Trivial merge